Skip to content

Conversation

@linawolf
Copy link
Member

It is confusing to ppl, why our controllers do not extend the Actioncontroller

Releases: main, 13.4

It is confusing to ppl, why our controllers do not extend the Actioncontroller

Releases: main, 13.4
@linawolf linawolf merged commit dc4d518 into main Nov 20, 2025
28 checks passed
@linawolf linawolf deleted the task/abstract branch November 20, 2025 14:44
@github-actions
Copy link

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ca2bcdc... [TASK] Get rid of the AbstractController
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Classes/Controller/BlogController.php
CONFLICT (content): Merge conflict in Classes/Controller/BlogController.php
Auto-merging Classes/Controller/PostController.php

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-176-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ca2bcdc593b8a387ac187459a0cf90437cf4b0c4
# Push it to GitHub
git push --set-upstream origin backport-176-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-176-to-13.4.

linawolf added a commit that referenced this pull request Nov 20, 2025
It is confusing to ppl, why our controllers do not extend the Actioncontroller

Releases: main, 13.4

(cherry picked from commit dc4d518)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants